Include glib-object.h instead of gobject/gsignal.h

Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkenums.h: Include glib-object.h instead of
	gobject/gsignal.h

	* gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
	  x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
	argument to the window_at_pointer() field of
	GdkPointerHooks. (Patch from Erwann Chenede)

	* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
	to 6 pointers.

diff --git a/ChangeLog b/ChangeLog
index 94422610e26f444f5a211e1bfd909408130cf0cf..66411c3dff203db72d96e23f018eb4546209f6c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkenums.h: Include glib-object.h instead of
+       gobject/gsignal.h
+
+       * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
+         x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
+       argument to the window_at_pointer() field of
+       GdkPointerHooks. (Patch from Erwann Chenede)
+
+       * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
+       to 6 pointers.
+
 2001-11-17  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkenums.h: must include glib-object.h only

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 94422610e26f444f5a211e1bfd909408130cf0cf..66411c3dff203db72d96e23f018eb4546209f6c9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,16 @@
+Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkenums.h: Include glib-object.h instead of
+       gobject/gsignal.h
+
+       * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
+         x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
+       argument to the window_at_pointer() field of
+       GdkPointerHooks. (Patch from Erwann Chenede)
+
+       * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
+       to 6 pointers.
+
 2001-11-17  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkenums.h: must include glib-object.h only

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 94422610e26f444f5a211e1bfd909408130cf0cf..66411c3dff203db72d96e23f018eb4546209f6c9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkenums.h: Include glib-object.h instead of
+       gobject/gsignal.h
+
+       * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
+         x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
+       argument to the window_at_pointer() field of
+       GdkPointerHooks. (Patch from Erwann Chenede)
+
+       * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
+       to 6 pointers.
+
 2001-11-17  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkenums.h: must include glib-object.h only

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 94422610e26f444f5a211e1bfd909408130cf0cf..66411c3dff203db72d96e23f018eb4546209f6c9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkenums.h: Include glib-object.h instead of
+       gobject/gsignal.h
+
+       * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
+         x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
+       argument to the window_at_pointer() field of
+       GdkPointerHooks. (Patch from Erwann Chenede)
+
+       * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
+       to 6 pointers.
+
 2001-11-17  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkenums.h: must include glib-object.h only

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 94422610e26f444f5a211e1bfd909408130cf0cf..66411c3dff203db72d96e23f018eb4546209f6c9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkenums.h: Include glib-object.h instead of
+       gobject/gsignal.h
+
+       * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
+         x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
+       argument to the window_at_pointer() field of
+       GdkPointerHooks. (Patch from Erwann Chenede)
+
+       * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
+       to 6 pointers.
+
 2001-11-17  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkenums.h: must include glib-object.h only

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 94422610e26f444f5a211e1bfd909408130cf0cf..66411c3dff203db72d96e23f018eb4546209f6c9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkenums.h: Include glib-object.h instead of
+       gobject/gsignal.h
+
+       * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
+         x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
+       argument to the window_at_pointer() field of
+       GdkPointerHooks. (Patch from Erwann Chenede)
+
+       * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
+       to 6 pointers.
+
 2001-11-17  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkenums.h: must include glib-object.h only

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 94422610e26f444f5a211e1bfd909408130cf0cf..66411c3dff203db72d96e23f018eb4546209f6c9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Sat Nov 17 21:07:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkenums.h: Include glib-object.h instead of
+       gobject/gsignal.h
+
+       * gdk/{gdkinternals.h,gdkwindow.c,gdkwindow.[ch],
+         x11,{fb,win32,x11/gdkwindow-*.c}: Add a dummy GdkScreen
+       argument to the window_at_pointer() field of
+       GdkPointerHooks. (Patch from Erwann Chenede)
+
+       * gdk/gdkdrawable.h (struct _GdkDrawableClass ): Up
+       to 6 pointers.
+
 2001-11-17  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkenums.h: must include glib-object.h only

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index edaf700392f4bfed351fd5949d48580ca7fe2b00..9a529c83ab8fc125d0d16ceb4368fb12f35788fc 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -135,6 +135,8 @@ struct _GdkDrawableClass
   void         (*_gdk_reserved2) (void);
   void         (*_gdk_reserved3) (void);
   void         (*_gdk_reserved4) (void);
+  void         (*_gdk_reserved5) (void);
+  void         (*_gdk_reserved6) (void);
 };
 
 GType           gdk_drawable_get_type     (void);

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 47f72645de7cd14b73c44e198ee0a0db15a8d5e4..8a70873f186c534cbbaa185909737645aee2b3e4 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -195,7 +195,8 @@ void     _gdk_windowing_window_clear_area_e     (GdkWindow  *window,
                                                 gint        width,
                                                 gint        height);
 
-GdkWindow* _gdk_windowing_window_at_pointer  (gint            *win_x,
+GdkWindow* _gdk_windowing_window_at_pointer  (GdkScreen       *screen,
+                                              gint            *win_x,
                                              gint            *win_y);
 GdkWindow* _gdk_windowing_window_get_pointer (GdkWindow       *window,
                                              gint            *x,

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 06b4951a6b182cc629c726c7d358a47f184b7d64..e166165140e011eefbeaa9529eb3f33b21df4b8f 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2637,7 +2637,7 @@ GdkWindow*
 gdk_window_at_pointer (gint *win_x,
                       gint *win_y)
 {
-  return current_pointer_hooks->window_at_pointer (win_x, win_y);
+  return current_pointer_hooks->window_at_pointer (NULL, win_x, win_y);
 }
 
 /**

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index bca2b065d3f9d346d9ed812b8b6e07160ec12e4a..eae6d9baaee63f17a4fb4cb7338323a467cdbd3b 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -198,13 +198,18 @@ struct _GdkGeometry
   GdkGravity win_gravity;
 };
 
+/* Dummy typedef for placeholder in GdkPointerHooks.window_at_pointer
+ */
+typedef struct _GdkScreen GdkScreen;
+
 struct _GdkPointerHooks 
 {
   GdkWindow* (*get_pointer)       (GdkWindow      *window,
                                   gint            *x,
                                   gint            *y,
                                   GdkModifierType *mask);
-  GdkWindow* (*window_at_pointer) (gint            *win_x,
+  GdkWindow* (*window_at_pointer) (GdkScreen       *screen, /* unused for now*/
+                                   gint            *win_x,
                                    gint            *win_y);
 };
 

diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index afb22550c0e13bd95ede89c668d5efcf8ac19703..1755fe4857504163973b13f1c154c2209d57c0bb 100644 (file)
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -1686,8 +1686,9 @@ _gdk_windowing_window_get_pointer (GdkWindow       *window,
 }
 
 GdkWindow*
-_gdk_windowing_window_at_pointer (gint *win_x,
-                                 gint *win_y)
+_gdk_windowing_window_at_pointer (GdkScreen *screen,
+                                 gint      *win_x,
+                                 gint      *win_y)
 {
   gint rx, ry;
   GdkWindow *retval = gdk_window_get_pointer (NULL, win_x, win_y, NULL);

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 3543501589a04e8721b13852379d100bbda9cbbc..68f88958ff7da6f3dcead95b93fc27940d62e62e 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -1882,8 +1882,9 @@ _gdk_windowing_window_get_pointer (GdkWindow       *window,
 }
 
 GdkWindow*
-_gdk_windowing_window_at_pointer (gint *win_x,
-                                 gint *win_y)
+_gdk_windowing_window_at_pointer (GdkScreen *screen,
+                                 gint      *win_x,
+                                 gint      *win_y)
 {
   GdkWindow *window;
   POINT point, pointc;

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 49a663694336f115b0ed8e10d829a8b98c674874..ca20fab5d01f0ea32385a2904e97b446e78bf829 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -2397,8 +2397,9 @@ _gdk_windowing_window_get_pointer (GdkWindow       *window,
 }
 
 GdkWindow*
-_gdk_windowing_window_at_pointer (gint *win_x,
-                                 gint *win_y)
+_gdk_windowing_window_at_pointer (GdkScreen *screen,
+                                  gint      *win_x,
+                                 gint      *win_y)
 {
   GdkWindow *window;
   Window root;

diff --git a/tests/testgtk.c b/tests/testgtk.c
index a429c6becfcd36eec2fd26247c868ad6fa592ac2..8f22c514dccd82802ad3dc1f28e3f8a4f8faf22e 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -10685,11 +10685,11 @@ layout_expose_handler (GtkWidget *widget, GdkEventExpose *event)
   
   layout = GTK_LAYOUT (widget);
 
-  imin = (layout->xoffset + event->area.x) / 10;
-  imax = (layout->xoffset + event->area.x + event->area.width + 9) / 10;
+  imin = (event->area.x) / 10;
+  imax = (event->area.x + event->area.width + 9) / 10;
 
-  jmin = (layout->yoffset + event->area.y) / 10;
-  jmax = (layout->yoffset + event->area.y + event->area.height + 9) / 10;
+  jmin = (event->area.y) / 10;
+  jmax = (event->area.y + event->area.height + 9) / 10;
 
   gdk_window_clear_area (widget->window,
                         event->area.x, event->area.y,
@@ -10701,7 +10701,7 @@ layout_expose_handler (GtkWidget *widget, GdkEventExpose *event)
        gdk_draw_rectangle (layout->bin_window,
                            widget->style->black_gc,
                            TRUE,
-                           10*i - layout->xoffset, 10*j - layout->yoffset, 
+                           10*i, 10*j, 
                            1+i%10, 1+j%10);
   
   return TRUE;